[POWERPC][XEN] Merge with xen-unstable.hg.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --cc tools/libxc/powerpc64/utils.c
Simple merge

diff --cc tools/libxc/xenguest.h
Simple merge

diff --cc tools/libxc/xg_private.c
index ab770bb3ab905fb9ee1c78f1830435656df6edd9,f45c2ebb0db70f4404b553ab26722ca07eced2ce..8d7775295746e4fdd8ad25d24cf83d326dc43674
--- 1/tools/libxc/xg_private.c
--- 2/tools/libxc/xg_private.c
+++ b/tools/libxc/xg_private.c
@@@ -188,23 -188,32 +188,44 @@@ unsigned long csum_page(void *page
      return sum ^ (sum>>32);
  }
  
- __attribute__((weak)) int xc_hvm_build(
-     int xc_handle,
-     uint32_t domid,
-     int memsize,
-     const char *image_name)
+ __attribute__((weak)) 
+ int xc_hvm_build(int xc_handle,
+                  uint32_t domid,
+                  int memsize,
+                  const char *image_name)
  {
-     return -ENOSYS;
+     errno = ENOSYS;
+     return -1;
+ }
+ 
+ __attribute__((weak)) 
+ int xc_hvm_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters,
+                 uint32_t max_factor, uint32_t flags,
+                 int (*suspend)(int domid))
+ {
+     errno = ENOSYS;
+     return -1;
+ }
+ 
+ __attribute__((weak)) 
+ int xc_hvm_restore(int xc_handle, int io_fd, uint32_t dom,
+                    unsigned long nr_pfns, unsigned int store_evtchn,
+                    unsigned long *store_mfn, unsigned int console_evtchn,
+                    unsigned long *console_mfn,
+                    unsigned int pae, unsigned int apic)
+ {
+     errno = ENOSYS;
+     return -1;
  }
 +
 +__attribute__((weak)) int xc_get_hvm_param(
 +    int handle, domid_t dom, int param, unsigned long *value)
 +{
 +    return -ENOSYS;
 +}
 +
 +__attribute__((weak)) int xc_set_hvm_param(
 +    int handle, domid_t dom, int param, unsigned long value)
 +{
 +    return -ENOSYS;
 +}

diff --cc tools/python/xen/lowlevel/xc/xc.c
Simple merge

diff --cc tools/python/xen/xend/image.py
Simple merge

diff --cc xen/arch/powerpc/domain.c
index 97a7ddc0020f79ac27b9064e8153dda129f76ee1,44665df19754296118bb6140c07e26c63293ed90..ad59282e97982dce1dc409df6680936327e94d28
--- 1/xen/arch/powerpc/domain.c
--- 2/xen/arch/powerpc/domain.c
+++ b/xen/arch/powerpc/domain.c
@@@ -149,22 -150,19 +149,22 @@@ void vcpu_destroy(struct vcpu *v
  {
  }
  
- int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_t *c)
+ int arch_set_info_guest(struct vcpu *v, vcpu_guest_context_u c)
  { 
-     memcpy(&v->arch.ctxt, &c->user_regs, sizeof(c->user_regs));
 +    struct domain *d = v->domain;
 +
+     memcpy(&v->arch.ctxt, &c.nat->user_regs, sizeof(c.nat->user_regs));
  
 -    printk("Domain[%d].%d: initializing\n",
 -           v->domain->domain_id, v->vcpu_id);
 +    printk("Domain[%d].%d: initializing\n", d->domain_id, v->vcpu_id);
 +
 +    if (d->arch.htab.order == 0)
 +        panic("Page table never allocated for Domain: %d\n", d->domain_id);
 +    if (d->arch.rma_order == 0)
 +        panic("RMA never allocated for Domain: %d\n", d->domain_id);
  
 -    if (v->domain->arch.htab.order == 0)
 -        panic("Page table never allocated for Domain: %d\n",
 -              v->domain->domain_id);
 -    if (v->domain->arch.rma_order == 0)
 -        panic("RMA never allocated for Domain: %d\n",
 -              v->domain->domain_id);
 +    d->shared_info->wc_sec = dom0->shared_info->wc_sec;
 +    d->shared_info->wc_nsec = dom0->shared_info->wc_nsec;
 +    d->shared_info->arch.boot_timebase = dom0->shared_info->arch.boot_timebase;
  
      set_bit(_VCPUF_initialised, &v->vcpu_flags);
  

diff --cc xen/arch/powerpc/domain_build.c
Simple merge

diff --cc xen/arch/powerpc/ofd_fixup.c
Simple merge

diff --cc xen/arch/powerpc/setup.c
Simple merge

diff --cc xen/arch/powerpc/xen.lds.S
Simple merge